Spring '16 (API version 36.0)
Use Salesforce admin, but use Salesforce administrator for UI text and end-user documentation related to logging in. If you’re using the phrase Salesforce admin more than a few times in a topic, it’s OK to shorten to admin.